PangoContext *context;
PangoFontMetrics *metrics;
PangoRectangle rect;
- gint char_width, digit_width, char_pixels, text_width, ellipsize_chars, guess_width, xpad;
+ gint char_width, digit_width, char_pixels, text_width, ellipsize_chars, xpad;
gint min_width, nat_width;
/* "width-chars" Hard-coded minimum width:
layout = get_layout (celltext, widget, NULL, 0);
- /* Get the layout with the text possibly wrapping at wrap_width */
- pango_layout_get_pixel_extents (layout, NULL, &rect);
- guess_width = rect.width;
-
/* Fetch the length of the complete unwrapped text */
pango_layout_set_width (layout, -1);
pango_layout_get_extents (layout, NULL, &rect);
else
nat_width = xpad * 2 + PANGO_PIXELS (text_width);
+
nat_width = MAX (nat_width, min_width);
if (priv->max_width_chars > 0)
if (natural_size)
*natural_size = nat_width;
-
}
static void